Rename some stuff and add light fetching.