Names fixed, and finishing

Done with front end, need the code for recorder