Fix naming, make consistent