Fix collection method
Fix constant names