Change to default class for naming