General naming updates, test scripts