Fixed issues with handling a different RPM name from package name