Removing first generic and signal, available only dynamic choices
Add port dynamic, name fixes for generic template