changed internal naming