Constant name cleanup in tests