Removed some extraneous requires from callbacks and naming.