renames to match naming standards