rederer thing + finished renaming