Stuff -> ShitHappens renaming and cleanups from the copy&paste