Rename
Consistency
Use correct strip