start fixing tests for itername change