Updated definition names to be more unique