Created by: kageiit
Also adds a more robust fix to the lambda descriptor naming problem we discovered in production