Rename packages and fix prefixes