Rename baselayers same as before

Can we please also have this merged to production branch...