Changed $observium_* to new names that are more generic