Name logic fixed-- no over rides