Renaming everything with an appended _block, and some cleanup