Rename confusing model name.
Remove redundant parameters.
Merge branch 'master' of https://github.com/tq-jappy/mind-salver