updated names for naming conventions