naming conventions, paint

Fixed naming conventions
Added new paint