Forward ported PR 570

Change included allows model package name (directory structure) to
contain the `-` (dash) character.