Renaming/refactoring to prepare for next shader