Use consistent and correct organization naming