Eliminated duplication for NamedParameters
Refactored towards better names