added some name changing. Comments.