NON WORKING COMMIT. Fixed definition names.