Fixing naming and not working includes