Added model lists, made module names consistent