Changed the names a bit