resolved model discrepencies, naming conventions