In 808, the initial names under the Ritsuryo system were revived by changing the name from Shumeryo to Samaryo, and from Naikyuryo to Umaryo, and Samaryo and Umaryo absorbed Hyomashi (Office of Military Horses) which had belonged to Hyobusho (Ministry of Military).
808年には主馬寮を左馬寮、内厩寮を右馬寮と改名して律令制当初の呼称が復活し、兵部省に属していた兵馬司を吸収した。