Fixing some issues with new parameter passing, improving backwards compatibility; implement requirement for unique System Name.