Further loving to cleanup unnecessary components and name more
appropriately.