Changed naming convention

Be concise.