Code bugs model. Also, renames for clarity.