SOS-1964 Adding namcespace for parameter, keywords