Consistent, simple naming convention; packages; hole detection