Fix names and unused variables