Name Identification - Remove gunColor & models (updated)

Updated a couple of methods.