Renamed remaining feature store references