Emergency push to fix master because of case problems with naming packages