Fixed various thing namings