Merge "Remove home package name methods." into klp-dev