rename for capitalization issue in windows
second part of rename for caps issue in windows
updates to models