naming: fixing naming conventions

Signed-off-by: Simarpreet Singh <simar@linux.com>
Merge branch 'master' of github.com:simar7/images

Signed-off-by: Simarpreet Singh <simar@linux.com>