Some naming refactors.  
Implemented Vendor Manager with Generic Address popup