cleanup names
use afmotion and update gems