Cleared up some name ambiguities