Naming Update
Naming Update
Updated Servers for standalone/command line usage