Fixed state names without proper namespacing that could lead to potential conflicts.
Merge pull request #15 from spsoit/master

Fixed state names without proper namespacing