Fixed issue #473
Naming pattern issues resolved.
Merge branch 'origin/dev'