Need to rename as class