Added permission as well as fixed other minor naming issues.