Updates names, fixes class replacement.