Add prefixes to models
Fix renanming error