Fixing missing commas and changed to right namespace.