Fix #825 InaSAFE single branding - fixes for naming convention.