Classes renamed for convention
Index config include fix