adapt to package naming conventions
Merge branch 'release/1.0.3'