RPM names rafactored