more renaming and snd stuffz