Changed structure of leveling and table names