bug813054 updated few object namings and made others consistent