Fix autoloader entries

Change-Id: I119088ce1f3af860af172f9f40955aa63cc1d59c