Custom Naming with corresponding tests added.