Remove ineffectice code for replacing class names. Our applications work well without it.
Methods should be protected so that they can be used/overidden from outside default package