Cleaning up name references and fixing setting accessibility