updates on the code

changing names