Remove Chris from conflicting names