Fix some naming inconsistencies in the interface