renaming for consistency
still trying to get the merge fixed