Added bug fixes and integrated user defined name based changes.