Better naming of classname