fixed internal naming