Fixed namespace to reflect new Component separation