Little changes on namings