cleaned up naming convention, use longer ids, etc