Ok thanks Ramana. If that's the case I think we will change our schema to be the same name throughout the landscape and just reset up our dev and staging environments to have same name as production to avoid having re-replicate all production data. It's already a big enough job doing the first two systems.
Thanks for the feedback.