Fix issues on namespace name

Based on the reply on this
http://world.episerver.com/Modules/Forum/Pages/thread.aspx?id=71038&pageIndex=1#reply