Change naming of unit functions