Improve Movment-Ifs and Names