Prelim renaming and snippets