Reflect to stored procedure name change together with some code clean up.
Merge branch 'develop' of github.com:junshao/CMP into develop