Standardize property names, return types, units