Changed the names to be more CSy