Use consistent storage location
Make RPM name harbour compatible