Changed internal property names