Renamed types to conform with the abus -> albus change.