revamped class name matching
rebuild model