APD-547: Changed camelCase naming of button
APD-547: Removed unwanted code
Merge branch 'APD-547' into develop