Fix package name consistancy issues