Fixes old names not refactored