Unmount entity fix
Some spelling errors and minor re-factor of non-camel case methods