Merge "change serviceBase modal file name to InstantiationBase"