Rename, change titles/descriptions, fix minor bugs
Land #8, @hmoore-r7's updates to SM modules