Rename and make CLI work