Circular dependency from bad renaming