SWITCHYARD-234

changes to arguments names, consistent calls of contructors