some method names renamed. Test successful.
Methods renaming done. Test successful.