Fix remaining issues from post rename