Replace references to .system