Updated names to make it more generic