Rename classes and remove getData from model