Change command names
Change variable name and use include functions over commands