small naming changes