modifications to adhere to csi package service renaming