Renamed confusing things