Fixes naming conventions, adds user index action