Change internal property names