Dropping _athena file suffixes

Signed-off-by: shennetsind <ind@henn.et>