Continue fixing rename