fix names for consistancy