Modifying namespace definitions and removing import preparator