Renaming BaseConfigurator + few new specs