Change some names and some code changes