More logical and natural names and mechanisms in configuration...

More logical and natural names and mechanisms in configuration...