Removes Deprecated APIs

Removes Deprecated APIs and removes tests that assume the old APIs
Reverts to using the datacenter short name to keep it consistent with the user input filter options

Note: This is a big change.