Removed elements of naming indecision