Update key names, separate load time weaving from compile time.