- Rename.objectHasName simplified
- Minor formatting issues