Added bug fixes and user defined name based changes.