Commit checkindex
Remove old naming