More fixes for names
More fixes for initial checkin