Move numbers regex
Shorter names