Dropping _athena conf suffixes

Actually I need a pull request to test the pull-request API I'm writing for the forum so, don't merge please :3
Thank you
Signed-off-by: shennetsind <ind@henn.et>