Now replacing keys in move-preprocess targets