The naming convention within the helm chart is a bit iffy in places. We should probably harmonise where possible