finish renaming and fix some windows 8 bugs