Renamed confusing functions