simplified naming scheme
fixed name to reflect simplified class naming