Change some names to better fit the application