Fix name space issues due to change in bundle name