Fix various name and include directory