Update timings patch for cleanup and better efficiency
Rename some API patches