Revert "Moving to phrasing from `git`"

This reverts commit d1f433c1427d95dc5aadaac0c9d689eb86f12886.
Revert "Moving to consistent naming convention"

This reverts commit cc97ff0e1fb46b226c38107319c9aa65577727c2.