inner class naming fix
generics declaration fixed