Updated and fixed some basic namings.