More copypasta and find/replace fixing